home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
Atari Mega Archive 1
/
Atari Mega Archive - Volume 1.iso
/
gnu
/
othergnu
/
groff.zoo
/
atari-groff.diff
next >
Wrap
Text File
|
1992-05-10
|
36KB
|
1,236 lines
diff -rc2N groff-1.05/Makefile groff-1.05.atari/Makefile
*** groff-1.05/Makefile Sat May 9 15:42:02 1992
--- groff-1.05.atari/Makefile Sat May 9 22:48:08 1992
***************
*** 1,5 ****
#Copyright (C) 1989, 1990, 1991 Free Software Foundation, Inc.
# Written by James Clark (jjc@jclark.com)
- #
#This file is part of groff.
#
--- 1,4 ----
***************
*** 123,130 ****
# Uncomment the next line if you have vfork().
! D2=#-DHAVE_VFORK
# Uncomment the next line if you have sys_siglist[].
! D3=#-DHAVE_SYS_SIGLIST
# Uncomment the next line if you have the mmap() system call (and you
--- 122,129 ----
# Uncomment the next line if you have vfork().
! D2=-DHAVE_VFORK
# Uncomment the next line if you have sys_siglist[].
! D3=-DHAVE_SYS_SIGLIST
# Uncomment the next line if you have the mmap() system call (and you
***************
*** 133,137 ****
# Uncomment the next line if you have the rename() system call.
! D5=#-DHAVE_RENAME
# Uncomment the next line if the argument to localtime() is a long*
--- 132,136 ----
# Uncomment the next line if you have the rename() system call.
! D5=-DHAVE_RENAME
# Uncomment the next line if the argument to localtime() is a long*
***************
*** 141,145 ****
# Uncomment the next line if wait is declared by your C++ header files
# to take an argument of type union wait *.
! D7=#-DHAVE_UNION_WAIT
# Uncoment the next line if your C++ header files declare a type pid_t
--- 140,144 ----
# Uncomment the next line if wait is declared by your C++ header files
# to take an argument of type union wait *.
! D7=-DHAVE_UNION_WAIT
# Uncoment the next line if your C++ header files declare a type pid_t
***************
*** 155,159 ****
# Uncomment the next line if <sys/wait.h> should not be included
# when using wait(). Use this with the libg++ header files.
! D10=-DNO_SYS_WAIT_H
# Uncomment the next line if you C++ compiler requires delete [n] rather
--- 154,158 ----
# Uncomment the next line if <sys/wait.h> should not be included
# when using wait(). Use this with the libg++ header files.
! D10=#-DNO_SYS_WAIT_H
# Uncomment the next line if you C++ compiler requires delete [n] rather
***************
*** 185,189 ****
# MALLOCFLAGS=-DUSG
# Use this with SunOS 4.1 and 4.1.1.
! MALLOCFLAGS=-DBSD -DSUNOS_LOCALTIME_BUG
# Comment this out if the GNU malloc gives you problems, or if you would
--- 184,189 ----
# MALLOCFLAGS=-DUSG
# Use this with SunOS 4.1 and 4.1.1.
! #MALLOCFLAGS=-DBSD -DSUNOS_LOCALTIME_BUG
! MALLOCFLAGS=-DBSD
# Comment this out if the GNU malloc gives you problems, or if you would
***************
*** 211,217 ****
# CC is the C++ compiler
! CC=g++
# This is the flag that tells the C++ compiler to treat a .c file as C++.
! C++LANG_FLAG=
# I'm told that -fno-inline is needed on a 68030-based Apollo
# CC=g++ -fno-inline
--- 211,217 ----
# CC is the C++ compiler
! # CC=g++
# This is the flag that tells the C++ compiler to treat a .c file as C++.
! # C++LANG_FLAG=
# I'm told that -fno-inline is needed on a 68030-based Apollo
# CC=g++ -fno-inline
***************
*** 218,223 ****
# Use this with gcc/g++ version 2.
! # CC=gcc
! # C++LANG_FLAG=-xc++
# OLDCC is the C compiler.
--- 218,223 ----
# Use this with gcc/g++ version 2.
! CC=gcc
! C++LANG_FLAG=-xc++
# OLDCC is the C compiler.
***************
*** 225,231 ****
PROFILE_FLAG=
! DEBUG_FLAG=-g
# With gcc/g++ 2.0 on a sparc, -O works better than -O2.
! OPTIMIZE_FLAG=-O
WARNING_FLAGS=#-Wall -Wcast-qual -Wwrite-strings
--- 225,232 ----
PROFILE_FLAG=
! DEBUG_FLAG=
# With gcc/g++ 2.0 on a sparc, -O works better than -O2.
! #OPTIMIZE_FLAG=-O
! OPTIMIZE_FLAG=-O2
WARNING_FLAGS=#-Wall -Wcast-qual -Wwrite-strings
***************
*** 245,253 ****
LDFLAGS=$(PROFILE_FLAG) $(DEBUG_FLAG) $(XLDFLAGS)
# Libraries needed for linking C++ programs.
! LIBS=
# Libraries needed for linking C++ programs that use libm.a.
! MLIBS=$(LIBS) -lm
! AR=ar
# Define RANLIB to be empty if you don't have ranlib.
--- 246,255 ----
LDFLAGS=$(PROFILE_FLAG) $(DEBUG_FLAG) $(XLDFLAGS)
# Libraries needed for linking C++ programs.
! LIBS=-lg++
# Libraries needed for linking C++ programs that use libm.a.
! #MLIBS=$(LIBS) -lm
! MLIBS=$(LIBS)
! AR=gcc-ar
# Define RANLIB to be empty if you don't have ranlib.
Binary files groff-1.05/gendef and groff-1.05.atari/gendef differ
diff -rc2N groff-1.05/groff.c groff-1.05.atari/groff.c
*** groff-1.05/groff.c Wed Oct 30 12:12:48 1991
--- groff-1.05.atari/groff.c Sat May 9 22:24:26 1992
***************
*** 45,50 ****
#else
typedef int PID_T;
! #endif
!
#ifdef HAVE_UNION_WAIT
typedef union wait WAIT_STATUS_T;
--- 45,49 ----
#else
typedef int PID_T;
! #endif // HAVE_PID_T
#ifdef HAVE_UNION_WAIT
typedef union wait WAIT_STATUS_T;
diff -rc2N groff-1.05/lib/Makefile groff-1.05.atari/lib/Makefile
*** groff-1.05/lib/Makefile Thu Aug 22 12:32:00 1991
--- groff-1.05.atari/lib/Makefile Sat May 9 20:24:40 1992
***************
*** 34,38 ****
ptable.o font.o fontfile.o nametoindex.o filename.o lineno.o \
progname.o lf.o change_lf.o version.o tmpfile.o \
! $(FMOD) $(STRTOL) $(GETCWD)
SOURCES=new.c itoa.c strerror.c error.c errarg.c fatal.c prime.c \
strsave.c matherr.c fmod.c assert.c iftoa.c tmpfile.c getcwd.c \
--- 34,39 ----
ptable.o font.o fontfile.o nametoindex.o filename.o lineno.o \
progname.o lf.o change_lf.o version.o tmpfile.o \
! $(FMOD) $(STRTOL) $(GETCWD) getopt.o getopt1.o
!
SOURCES=new.c itoa.c strerror.c error.c errarg.c fatal.c prime.c \
strsave.c matherr.c fmod.c assert.c iftoa.c tmpfile.c getcwd.c \
***************
*** 39,42 ****
--- 40,44 ----
string.c cset.c cmap.c ptable.c font.c fontfile.c nametoindex.c \
filename.c lineno.c progname.c lf.c change_lf.c version.c \
+ getopt.c getopt1.o getopt.h \
assert.h cset.h cmap.h errarg.h error.h font.h getpagesize.h \
lib.h ptable.h stringclass.h
***************
*** 55,58 ****
--- 57,66 ----
@echo const char \*version_string = \"`cat ../VERSION`\"\; >$@
+ getopt.o: getopt.c getopt.h
+ $(OLDCC) $(OLDCFLAGS) -c getopt.c
+
+ getopt1.o: getopt1.c getopt.h
+ $(OLDCC) $(OLDCFLAGS) -c getopt1.c
+
malloc.o: malloc.c getpagesize.h
$(OLDCC) $(OLDCFLAGS) $(MALLOCFLAGS) -c malloc.c
***************
*** 84,88 ****
tmpfile.o: lib.h errarg.h error.h
! fontpath.h: FORCE
@$(SHELL) ../gendef $@ "FONTPATH=\"$(FONTPATH)\""
--- 92,98 ----
tmpfile.o: lib.h errarg.h error.h
! #fontpath.h: FORCE
! # @$(SHELL) ../gendef $@ "FONTPATH=\"$(FONTPATH)\""
! fontpath.h:
@$(SHELL) ../gendef $@ "FONTPATH=\"$(FONTPATH)\""
diff -rc2N groff-1.05/lib/getopt.c groff-1.05.atari/lib/getopt.c
*** groff-1.05/lib/getopt.c
--- groff-1.05.atari/lib/getopt.c Sat May 9 19:25:24 1992
***************
*** 0 ****
--- 1,595 ----
+ /* Getopt for GNU.
+ Copyright (C) 1987, 1989, 1990 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+
+ #ifdef __STDC__
+ #define CONST const
+ #else
+ #define CONST
+ #endif
+
+ /* This version of `getopt' appears to the caller like standard Unix `getopt'
+ but it behaves differently for the user, since it allows the user
+ to intersperse the options with the other arguments.
+
+ As `getopt' works, it permutes the elements of `argv' so that,
+ when it is done, all the options precede everything else. Thus
+ all application programs are extended to handle flexib